Autogenerated HTML docs for v1.7.2-rc3-52-gc5212
diff --git a/git-mergetool.txt b/git-mergetool.txt index 55735fa..e4ed016 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt
@@ -72,6 +72,16 @@ This is the default behaviour; the option is provided to override any configuration settings. +TEMPORARY FILES +--------------- +`git mergetool` creates `*.orig` backup files while resolving merges. +These are safe to remove once a file has been merged and its +`git mergetool` session has completed. + +Setting the `mergetool.keepBackup` configuration variable to `false` +causes `git mergetool` to automatically remove the backup as files +are successfully merged. + Author ------ Written by Theodore Y Ts'o <tytso@mit.edu>
